bitkeeper revision 1.1159.1.476 (41b9ff77QqNYRb0qfaEAPdWrHHIrog)

sync w/ head.

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c
index 5e2e798628bb475993e77a53f96f3ef9e011e5d2..2cfd0140f5fb593e516263202823cf4ad5b102eb 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c
@@ -904,7 +904,7 @@ static int __init do_boot_cpu(int apicid)
                     va < cpu_gdt_descr[cpu].address + cpu_gdt_descr[cpu].size;
                     va += PAGE_SIZE, f++) {
                        ctxt.gdt_frames[f] = virt_to_machine(va) >> PAGE_SHIFT;
-                       protect_page(swapper_pg_dir, (void *)va, PROT_ON);
+                       make_page_readonly((void *)va);
                }
                ctxt.gdt_ents = cpu_gdt_descr[cpu].size / 8;
                flush_page_update_queue();